Merge remote-tracking branch 'origin/master' into feature/pgtk

author Po Lu <luangruo@yahoo.com>

Tue, 7 Dec 2021 01:32:13 +0000 (09:32 +0800)

committer Po Lu <luangruo@yahoo.com>

Tue, 7 Dec 2021 01:32:13 +0000 (09:32 +0800)
author Po Lu <luangruo@yahoo.com>
Tue, 7 Dec 2021 01:32:13 +0000 (09:32 +0800)
committer Po Lu <luangruo@yahoo.com>
Tue, 7 Dec 2021 01:32:13 +0000 (09:32 +0800)
diff --cc lisp/startup.el
Simple merge
diff --cc src/image.c
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Tue, 7 Dec 2021 01:32:13 +0000 (09:32 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Tue, 7 Dec 2021 01:32:13 +0000 (09:32 +0800)
		1	2
lisp/startup.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/image.c	patch \|	diff1 \|	diff2 \|	blob \| history